From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2016 19:41:37 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2921
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=745dd912e628aff1ebcafa672dd16e99cb9db0ba;p=emacs.git

Merge from origin/emacs-25

939eb75 Fix bug in default setting of 'ps-paper-type'
---

745dd912e628aff1ebcafa672dd16e99cb9db0ba